Added missing default events in realize() implementations
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Mon, 29 Mar 2010 17:22:18 +0000 (13:22 -0400)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Mon, 29 Mar 2010 17:22:18 +0000 (13:22 -0400)
Added gtk_widget_get_events() to the event masks declared by
GtkToolPalette & GtkToolItemGroup.

gtk/gtktoolitemgroup.c
gtk/gtktoolpalette.c

index fea9f29d45b2724107ebe12cba7b7d6ed33323da..a3d75b7565e88b3f16cf8b144b503957197dcdfa 100644 (file)
@@ -1167,9 +1167,10 @@ gtk_tool_item_group_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK
-                        | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        | GDK_BUTTON_MOTION_MASK;
+  attributes.event_mask = gtk_widget_get_events (widget)
+                         | GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK
+                         | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                         | GDK_BUTTON_MOTION_MASK;
 
   widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                    &attributes, attributes_mask);
index e7b94007a76142712e331575a685269d75b2eda5..fa37edcc56c733c884e9c3fbada89ee3b9da4f22 100644 (file)
@@ -662,9 +662,10 @@ gtk_tool_palette_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK
-                        | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                        | GDK_BUTTON_MOTION_MASK;
+  attributes.event_mask = gtk_widget_get_events (widget)
+                         | GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK
+                         | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                         | GDK_BUTTON_MOTION_MASK;
 
   widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                    &attributes, attributes_mask);